6.1.30 plus svc builder

FYI - Here's the same 6.1.x branch that you saw I just sent to Rich.