remaining updates from v1.3.2 of official