Return codes
New response wrapper based on new return codes
Merge origin/master