Merge pull request #234 from TopherMan/feature/M26

Feature/m26
Merge remote-tracking branch 'upstream/edge' into edge