Integrating erocs changes to this fork