Merging changes from plugin till

SHA-1: 08e6fb071ccd755415c36a080b09f4ce946ccc27

* Back to 3.1-working