Merging mainline into jbank fork