Merge "Fix skipping the last address line and avoid appending nulls." into rvc-dev