Merge branch mps/branch/2014-04-23/awl into the master sources