Import version 5.63-24 from Sisyphus