Applied patch (3/19)

Applied patch