Merge remote-tracking branch 'masatake/next' into deploy

Signed-off-by: Reza Jelveh <reza.jelveh@tuhh.de>