Adding FIXME to free cuda memory
Merge branch 'master', remote branch 'origin'