Commit 2.7.k