Merge "Synchronized with snapshot releases again"