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