merge of '49e39c42b944dda8eed607394e1849029b9f527f'