Merge branch 'OSEE_0.16_release' into sprint52