Plugin docu updates.
Plugin plugin merge conflicts resolved.