First try to patch CORE-1915