Merge "Switch deprecation message to $(warning)"