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