SWORDMAN-11704

SWORDMAN-11704