Manually merging the commit 4ee7289 from master into SlipStreamServer-2.2.5-maintenance.