*8232* Make required forms required (master branch only)