[OE-4695] - re-adding code to handle default behaviour