Merge 'refs/rewritten/junio/notyet' into HEAD