Merge commit '7667ecd49e9da9db3e9385826bad56ee851adacb' into HEAD
Merge commit '1cce914968bfd0606901549cedb550ffc6d54041' into HEAD