Merge topic 'bug/2676'