Merge "[SEBA-720] Adding support for latest bbsim"