FORGE-1114: Added lenient option