merge simple plugin master due to #2917