Adapt changes from https://github.com/numba/numba/pull/8318/files#diff-2df48118bba9e73a681d271761e063d5f84ea485bd00b65c7afd7799fba930c7L1107-R1114
Adapt changes from https://github.com/numba/numba/pull/8318/files#diff-2df48118bba9e73a681d271761e063d5f84ea485bd00b65c7afd7799fba930c7L1107-R1114

numba/numba,cpcloud/numba,cpcloud/numba,cpcloud/numba,numba/numba,numba/numba,cpcloud/numba,numba/numba,cpcloud/numba,numba/numba