merge from "output options" branch