Merge "Protolog refactor." into main