Add gold future option support
Merge branch 'develop' into ui/dev