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