Code base as of version 2.1.24