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