Sherpa 210 62 x

Merging also #572 that was left behind.