Merge "DALi Version 2.1.23" into devel/master