Add prs/commits/features/fixes in develop branch to next branch

1. https://github.com/yahoo/mojito/pull/1232