Merge branch 'jt/push-options-doc'