Gpii 1029

http://issues.gpii.net/browse/GPII-1029
we can probably remove this comment if the old form is no longer in use