Merge branch 'hotfix/abstract-computed-field'
Removed a call to a non-existent base constructor;
Correctly set the method to be overridden
Merge branch 'hotfix/computed-fields' into develop