Sync changes from upstream repository

:zap::zap::zap: