Merge branch '8.x-1.x' into use_invalidate_tags