SP-326 - Backport of PDI-9908

Adding copyright + javadoc