Bulk updates

Covers JAVA-1124 & JAVA-1135