Merge "DALi Version 2.0.49" into devel/master