Merge pull request #4904 from kumpera/more_opts