Merge "Regression tests for Etag handling"