Merge "Do not rebase Resources with non RM impls" into rvc-dev