Some important fixes need to be incorporated
(from redmine: created on 2013-07-30, closed on 2013-07-30)