Merge commit '62f7901aeb7df00be41da3a79d8a8962bcb7c1fb' into jb-4.2