Ported from 1.5.x: 71cbffce2acfa5c84a0efa099a35b045f6425735

Signed-off-by: suhrud <supatank@in.ibm.com>