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