Remove some differences between develop and ascraeus branches.