Merge "Refactoring BP Code with ErrorCatalog"