Merge branch 'candidate-5.6.4' into candidate-6.0.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>