Merge "DALi Version 1.2.50" into devel/master