Merged jnoring changes
Merge branch 'jnoring-master'