Yep. #3874 and #3235.