Merge "Handle identity.protocol" into release/2019.2.0