Merge from jb-4.1