603fc1b
addition patch for rhbz#1630187 and new ones for rhbz#1588596 Resolves: rhbz#1630187, rhbz#1588596