[release/3.0] Getting ready for Teatro

Description in commit logs.
This won't work in 3.0.x