merge of '909c536d732a709ac1bbe82a546de7dade5fdf07'