Merging code from JenkinsCI to HPSA to be the next baseline (from version 3.0.6)