Fix http deployment
Merge branch 'S4-111' into dev