Feature 4 uiexamples

Merge features-4-dev with dev-4