Merging Peddy fixes into develop, turning off the mismatch check for now
merged
mentioned in merge request !8 (merged)