FS-3772 --resolve  please no vanity comments