Merge branch 'fix/html-cache-content-collision' into 'develop'