Merged plugin installer changes