(compilation-only commit, to ease merging)