Merge remote-tracking branch 'origin/dev' into fix-ci-incremental-verify

# Conflicts:
#	.verify-helper/timestamps.remote.json

Author: cameroncuster