making a branch from the ops tag so I can attempt to merge changes from the trunk and then back into the trunk...