Merge "DALi Version 1.2.64" into devel/master