S59123 - Updated RPB to handle both start/end and startDate/endDate fields