Added new JAI Pain(t)Descriptor (SNAP-5)
Fixed new JAI Pain(t)Descriptor (SNAP-5)
Merge branch 'SNAP-5'
Merge branch 'master' into nestmod