Merge branch '1.5-common-plugin' into 1.5

Closes GH-124