FS-5291 --resolve
FS-5250: --resolve fix mac build