Applying patch given by Vimuth, for STRATOS-514