FS-5331 --resolve yes this is a bug that is now fixed
FS-5339 --resolve
FS-5329 --resolve