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