Issue #2258091 by yched: Reorder methods in EntityViewBuilder into more logical sequence.