Merge remote-tracking branches 'github/pr/1857', 'github/pr/1859' and 'github/pr...