Context fixes

Sebastien Poncerequested to merge
contextFixes into future

DO NOT MERGE this is temporary until this fix is accepted into core gaudi and merged into this repo

Merge request reports