LAI-5 REST trigger prep (home cleanup)
Merge remote-tracking branch 'origin/master'

* origin/master:
  LAI-5: updated error handling and comments
  LAI-5: updated error handling and comments