Fixed #1065
Fixed #1060
Fixed #1054
Auto generated commit for version 3.1.92.225-Test
Auto generated commit for version 3.1.93.225