Synchronized the OBP envelope with the transaction saver
Merge branch 'develop'