Merge branches 'form-layouts', 'file-upload' and 'typeahead-datasets' into private