Minor update of sample application
Various fixes and add policy