merge pulled out the compiler plugin