merge simple plugin master due to #2917
Fixes: #2918 missing comma