MBS-6813: Correct display of add puid edits
Merge branch 'mbs-6813' into beta