manual merge of branch 'Err cmplx format' #271