Merge with latest updates from 52North:master