Fixes: #2858 merge master of simple-plugin to fusiondirectory