Merge "4.1.1" into jb-dev