Merge with the core queries branch from Richard.