NAL8 bug fixes
Merge origin/master