Merge from SVN. All new Static features included