merging this branch to facilitate moving repo to ActiveSCM, then will start branch over again