bd6b11dd58
Merge commit 'e5fb328825995aa33b5b7ecf8b5bee2b17f81715' * commit 'e5fb328825995aa33b5b7ecf8b5bee2b17f81715': resolution support fix/improvement