Merge "Change the way how we track deployment" into stable/colorado