V1.2 d4 - changes requested by Jira DC21-522