Merge commit '8246601a7d391ce8207408149d65732f28af81a1' into fixes