Counter support - bug 15174

This