CON-1016

*DO NOT MERGE*
order of attributes?