applying patch for STRATOS-461