partial merge of pr/59 for pig 13