CON-1076 | reverted the change in attribute order