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