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