Merge "DALi Version 1.2.52" into devel/master