Adding plural support per request of TWN
Merge branch 'budid-95250' into dev