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