Merge "Update SO docker manifests to 1.3.6"