merge of '64b6093032eef8f7c38258a8a93dfdc4ea46c39c'