[MCC-115109] Merge into master

@BPONTES @mdsol/hypermedia-team Please merge this.