automaticChangesReplay option plus some fixes