Starting on #707. Add old code macroed out
Merge branch 'master' into issues_M