fix_GPU_resource_handling

Change-Id: I4fdb88c0700e5ca73fd6eba087a230c3cbacdba8
Merge topic 'piston-bugfix' into master

313b647f fix_GPU_resource_handling