#5394 and #4567