Conflict branch

These are bryans hotfix changes