Merge "Keep unforwarded operation for noted ops." into rvc-dev