tabbed_properties branch merged into trunk completely