Merge branch 'task-204-on-options-request' into 'develop'