prevent tran dateWatch from altering trans that don't exist
Merge branch 'master' into captable_refactor
Merge branch 'captable_refactor' into testing