Merge branch 'origin' -- abandoned work