Merge pull request #12752 from triple-j/go90_improvements_pull_request