Issue [#1154420] by Hugo Wetterberg, Readd support for rich options for resources - needed by auth mechanism