Pull master into shift for testing shifts with current system