Merge "Refactoring: Use explicit methods for checking DO/PO"