This is a manual merge of branch drop split view intro trunk.