APD-654: PDF and Nullpointer
Replace <match> in gsp
Fix Javadoc
Merge branch 'APD-654-BOZ' into develop