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