#2364 imported key from master-2.2.1