Agradi weapons, where to find? (Metro Exodus)

In General the game has passed,and certainly not found two upgrade.

1. Advanced store valve double row.
2. Semi-automatic system for the same valve - found in the forest.
Case no one knows the place of their spawn?