Merge PR-1291 (OCFS SR tech preview) into upstream.