*8850* hash commit ##jnugent/8850-fix##