Updates to check for usage cap
Merge branch 'promotions' into dev