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