Syncing with 1.3.1