Final changes for v1.1.4.