Computed attributes finished
Merge branch 'computedAttributes'