Merge branch 'options' into custom