Merge "DALi Version 1.2.31" into devel/master