#3386 partial fixes