BW merged singleton changes per pull request.