Importing fixes from Model branch to the gpu library