Merged issues #21664, #21628, and #21684

All tests pass locally, ready for QA review of limited featureset.