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