commit 4982