Brought in the latest changes from61X development