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