pull to embr r95
Merge from embr r95
re-enabled api quota, witch is disabled in embr r95