Merge commit '82454c3a826bc8aa42474097784b70befd5be532'