merge pul #1642