Merge "AdapterProperties: Logging and logic refactor"