Recent changes to core code
Latest changes to sample app