E0d/preview

Branch re-based against release with unrelated commits from master removed.