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