BS-2687
OutOfMemoryError on multiple form widget refactors