sync with HJI
final commit from library changes