Change non-standard "standard" option name
Further change
Merge branch 'i2amroy-Sidebar'