Merge branch 'gpestana/stake-tracker_integration' into gpestana/stake-tracker_integration-strict-benches