TRUNK-4389 Added orderType check