Changes for the wp-676 branch