Patch for FELIX-4008 was accepted