1) fixed merge conflict
2) added logs
3) improved the OBP Envelope validation
merge conflict