Merge commit '47da1aa59eb36b55cda9138bec39942a14f051c4' into kernel