Merge "Remove heck-0.3.3" into main