[release/v1.1] Use unique field number for custom options

[release/v1.1] Use unique field number for custom options #23