[SCA] Minor SCA-based code improvements. (commit: 3e38132)
[0.21.0] Bump version, update changelog. (commit: 6cb074a)