Selectively merge only relevant update from 0.9.36.2 - rest were
Supergrafx changes - see separate repo for that