merge of 3805b1ac03600e59e510185d77bdb91333134e1f