[MCC-116788] Guard clauses

feature/guard-clauses was also reverted with feature/guard-clauses-cc.
@BPONTES @tkwan-mdsol @mdsol/hypermedia-team Please review and merge.