merge of '6cbf0719a581ec7faecefbc05b3c17d8b1b72d52'