Force instantiation to fix link errors in last commit #3496