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