FS-3054 --comment-only try latest commit, I can guess what probably causes the seg based on my last patch