Merge "BUG-2627: do not duplicate descriptions"