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