Version 3.0.0.7-beta ready
Merging 3.0.0.7 to pages