Merge "Refactor FUSE flag check logic"