Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
(cherry picked from commit a90182e3)