merge with branch jb2 manually :P