Merge "updated bbsim app versions"