Merge remote-tracking branch 'upstream/wip_4196' into wip_sam_test