Merge "DALi Version 1.2.47" into devel/master