Adding patch for CARBON-14841