Merge remote-tracking branch 'local-2.0/stable-2.0'