Stable/icehouse neutron

Adding neutron features to master branch