Merge commit '3f94dfa' into stable