https://issues.jboss.org/browse/PLINK-89
merged code
https://issues.jboss.org/browse/PLINK-89
https://issues.jboss.org/browse/PLINK-89
Merged code.