make everything deployed work with 0.5.18 before being able to merge well