Merge changes to completion in master