Merge pull request #1616 from mitchell852/1.6.x

Speeds up fetching of parameters