Merge "Fix NullPointerException on estimate object" into rvc-dev