merge from fluffos:next-3.0