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