[MCC-115109] Merge into Master

@BPONTES @tkwan-mdsol @mdsol/hypermedia-team, Ready to merge develop into master.
Please review and merge.