[dali_1.2.16] Merge branch 'devel/master'