CDB-1695 #resolves Fixes reached limits messages
Merge CDB-1695 into release/2.9.3