Merge master in sync with v4.1 with new plugins