Merge branch 'bcmsysport-napi-updates'