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