Merge "add error propagation for thunking layer" into klp-dev