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