[RESEND 0/2] Changes for DP 1.4 Compliance test 4.2.2.6