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