[dali_1.4.5] Merge branch 'devel/master'