CAAERS-7013, changed for compatibility with java 1,6
Merge branch 'feature/CAAERS-7013' into develop