Merge "DALi Version 1.3.54" into devel/master