Merging changes from Jonathan.
Merge branch 'jonathanlee1-nkcdev' into nkcdev