[release/3.0] Getting ready for Teatro

[release/3.0] Getting ready for Teatro