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