FQWR-5847

FQWR-5847