Fix handling of last available $timePointToMatch / end of data stream
Fix handling of last available $timePointToMatch / end of data stream

remp2020/remp,remp2020/remp,remp2020/remp,remp2020/remp,remp2020/remp