Merge "Replace deprecated function"