small changes
Merge branch 'formsExtension' into plugInManagement