Synced with stable branch: