Final changes for 2.1.5b