Merge "Fix gnss replay"