Fixed 404 headers. REF: #1620
Merge remote-tracking branch 'upstream/v1.5.6.x' into v1.5.6.x