Cherry Pick with Nikos commit
Issue: System.c etc. missing