Merged fix from v1.6029a