Merge "Update Rail Data Collection Frequency" into qt-dev