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