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