Final non-dev commit before branching