Changes from ala42 20130428