UAR-629: Initial commit of files from foundation that need to be changed in order to use CustomProtocolAttachmentProtocol