Merge "Use LimitExceededException instead of IllegalStateException." into rvc-dev