Merge branch 'bridge_ageing_time'