squash merge of latest code on msgilligan-issue457 branch