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