merge patch 1 to canary

May be this is correct...