Adding changes from devops sig