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