Synced with version 2.6.1.0