#2151 for 2.2.1