FB-15261: Added tiny optimization found in mvc5r3 project