Follow up bd2503e,7355677 and fef6307. Merged Hercules e115c30