resolved merge from b1dfd648f25bc8048b36a8c6269e8b84d3bad940