Merge diverging branches

This pull request merges the diverging developments in the 7_2_X and 7_2_3_syncDev_* branches which occurred over the past few weeks.

Some modifications to the iso track producer, for synchronization purposes, have also been added.