Merge: rev770 (All acceptance tests passing again)