Fixed 404 headers. REF: #1620
merge upstream v1.5.6.x