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