Resolved conflicts in changes from Ward and Freek