Merge "updated plugin management section to cover plugin"