Merge latest commits to options

a7ac102a50a388fceef6011f226920316fd562bc

c6ffddbac219a1c4239397c04c243c7e131385bc

83d51217971baccaa0a5e2060edb8b80fabb6f41