Merge branch 'master' into offload_trapping