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