Merge "Various inset fixes" into rvc-dev