Generated code to support previous 2 commits.