Updated to latest SNAP dev branch