Merge branch 'test/common_api_utils.ex' into 'develop'