Closes #363 by adding @Transactional to GenericObjectService.java
Merge branch '2.1M2' into qa