c-p from master @ v3.6