Merge "Add bounds check when setting package usage" into rvc-dev