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