jpst processing updated with fixing the exception
Merge branch 'mark' into dev
Merge branch 'dev' into mark