Fix some broken samples
Fixes to json bean methods
Merge remote-tracking branch 'origin/master'