merge new v5, swagger based format branch w/ current code base
merge new v5, swagger based format branch w/ current code base