Annotation form tx

Rebase of #2993