Added use of new branch wp-677