Update from workstation 2014-04-21