Backports to the 1.8 branch (msg.plain, providers changes)