Merge "Fix NPE with disabled overflow." into rvc-dev