*8594* Review forms bhui contribution commit
(partial; with some cleanup)