Merge Richard's changes