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