merge with #1527 trunk