manual merge with dev branch. it's time to start updating demoes