Merge branch 'experimental' into dev
options page fix