Merge pull request #1182 from john-hill/SWC-1695

done
Merge pull request #1184 from john-hill/SWC-1685

SWC-1704 only
check
pagination
pom
Merge pull request #1191 from john-hill/SWC-1685-b

Swc 1685 b