Merge in "controller" feature branch