Cherrypicked deployment features