[OE-3856] reverted defaultScope() to the previous behaviour