Patch for #6602 on develop