Merge "Add test for content inflation during row inflation" into rvc-dev