Full merge (including both edits from Sean/Hugh and Nick)