Solenoid Subin

The Solenoid class
Merge origin/team-devel into team-devel