Changes for version 1.310