Merge "Filter changes according to API review" into rvc-dev