Merge "Switch to new distribution plugin." into idea133