Custom checkboxes not saved on Membership renewal.

1. Create a membership signup form configured with on behalf of organization. Make sure to create custom data of organization subtype with html type as checkbox.
2. Signup for membership on behalf of organization with subtype with custom data fields filled in.
3. Renew the membership - custom data will be pre-filled.
4. On confirming contribution only the checkbox custom data gets lost.