Master

Fixed bidirectional workflow unconsistencies.