Fix System linking [story:48136163] [story:48140611]