Merge up final changes from feature branch