merging STRATOS-647