Merge branch 'experimental' but switch back to non-RT flash thread.