MODE-1891: Backward compatibility with older repositories