[DO NOT REVIEW] Fixes #7816 - Refactor strong_params code