Stable deployment branch

[Work in Progress]