Converted into 3.0 SP2

Updated some components