Added to both LTS and Master branches.