Merge "Fix QS FBE-ness" into nyc-dev