Merge "DALi Version 1.9.4" into devel/master