Updates to latest wip/sbt-rc-formal-api