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