Update from master - removes unneccesary nextimage run