git patch against core-8-5-branch