FS-5044 --resolve proposed solution appears to be the best route