Tickets/master/11263

I'm retaking this pull request as I've needed some of the options lately.