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