fixed merge for 2.2.1 #1491