Merge "DALi Version 2.2.23" into devel/master