#2064 for 2.2.1