Fixes ported from SLE branch

Port based on regression check reported in bnc#831833