techdebt/389/fieldRefactor



<!---
@huboard:{"order":244.149169921875,"milestone_order":444,"custom_state":"blocked"}
-->