Rebase off 9.3.x Added test per comment #279.6 Addressed feedback from MR 437 except disputed comments