changes for wm2014

This pr contains the changes that were made for the wm 2014