Merge remote-tracking branch 'bakulf/null_thread'
(cherry picked from commit aca113a37ed6e94b7576ea8bcf0c8281d3cb4d2e)