Merge: Separate Erasure Compiler bugfix