OFC-1293 - Do not wrap labels in form items