version is same as jqa version
merge
merge
added checks with PMD