- backported fixes from 1.7.2-1.1.0.5