StanFR-2493

StanFR-2493