Apply review comments
Merge remote-tracking branch 'upstream/dev' into dev
Using || instead of &&
Improve tests
Add missing createOrUpdate methods and UT
Add missing validations
Merge remote-tracking branch 'upstream/dev' into dev
Merge pull request #1106 from andrerod/dev

Apply review comments