Applied patch from mna-at-33x
General plugin updates