key_commit: 1407, 1694 - fixed