Merge remote-tracking branches 'tchaikov/wip-fix-safe_read_file', 'upstream/master', 'upstream/wip-10080' and 'upstream/wip-crush-straw' into wip-sam-testing