Merge commit '37d4df1e' into feature/define-equality