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