Merge "If didSomething condition is reversed." into rvc-dev