fix option banners
Merge branch 'noop_support'