hints full commit (squashed: 140820)