Merge of potential display options.
Merge remote-tracking branch 'origin/wip/cookie' into wip/cookie