Synch with current trunk (2 fixes)