tech review changes
Merge pull request #1595 from RickSaling/custom

tech review changes