MOB-91: Prep to upgrade to FB 2.0.6