Workaround rtt calculation issue sometimes observed

Merged Gijs Peskens requested to merge workaround_rtt_calc_issue into master

Merge request reports