GS-11422
refactor