Fixed Issue #7721 + custom plugin updates