[WIP] #17420 apply for auto-deploy

Todo:
after