Merge "Remove corrupt apexes only if not active" into rvc-dev