merged from P1620