DATAREST-93 - More repository tweaking.