Merge "AdapterProperties: Logging and logic refactor" into oc-mr1-dev