* Rename variable count to resolve shadowing (#3188)

* Amalgamate: Rename variable count to resolve shadowing (#3188)
Co-authored-by: Maarten Becker <maarten.becker@nuc-eng.com>