resolving STRATOS-938