Merge WBSs

Version 4.0 Changes