DRAGSLAYER-11452

DRAGSLAYER-11452