Finalized Development for 4.0

Finalized Development for 4.0