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