Fix Issue #673
  Added 'store' to LayerId call.
Merge pull request #674 from ejc123/Issue673

Fix Issue #673
Merge remote-tracking branch 'upstream/master' into benchmark-0.9