Merged sve1_fix_hack most recent commit