Merge for v2.1.0

[codacy-production[bot]]

Coverage summary from Codacy

Merging #499 (a8ae275fab28a30dd18c0ba27e3ae1be86af8fa7) into master (a0b69b8249565db3f58cece62be0eeb494b4a0ee) - See PR on Codacy

Coverage variation	Diff coverage
Report missing for a0b69b8249565db3f58cece62be0eeb494b4a0ee[^1]	83.57%

Coverage variation details

| | Coverable lines | Covered lines | Coverage | | ------------- | ------------- | ------------- | ------------- | | Common ancestor commit (a0b69b8249565db3f58cece62be0eeb494b4a0ee) | Report Missing | Report Missing | Report Missing | | | Head commit (a8ae275fab28a30dd18c0ba27e3ae1be86af8fa7) | 8599 | 7195 | 83.67% | **Coverage variation** is the difference between the coverage for the head and common ancestor commits of the pull request branch: ` - `

Diff coverage details

| | Coverable lines | Covered lines | Diff coverage | | ------------- | ------------- | ------------- | ------------- | | Pull request (#499) | 1047 | 875 | **83.57%** | **Diff coverage** is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: `/ * 100%`

See your quality gate settings    Change summary preferences

[^1]: Codacy didn't receive coverage data for the commit, or there was an error processing the received data. Check your integration for errors and validate that your coverage setup is correct.