Merge with Leigh changes