Rather than backporting these changes for 16.2, I think we should get this backport by pulling in the spec file from 17.0