Merge remote-tracking branch 'upstream/develop' into top-last-index-of

Merge remote-tracking branch 'upstream/develop' into top-last-index-of #590