Merge commit '1678ee'