Merge branch 'fix/public-option-not-working' into 'develop'