Includes follow-up patches (squashed):
- rename inner variables, fix backward compatibility
- fix CROB timming