NEXUS-6220: Adjust since tags