Merge "DALi Version 2.0.32" into devel/master