partially merge web branch into master