Merge "remap transactional capabilities" into main