PMO-2838: refactored to resuse exisiting code
PMO-2838: refactored to resuse exisiting code
Merge branch 'master' into 1.9.x
v1.9.15 uses latest core minor v 14