Merge "Modified to support Certificate and KeyPath"