CDI-429 Consistency of all built-in normal scopes
Include Jozef corrections