0.4-stable changes