synchronizing with simple-plugin master
Fixes: #2867 The code should not fix default values