[dali_2.0.19] Merge branch 'devel/master'