Merge "Paremeter for plugin dirs"