[OE-3381] Fixed base controller