Fixes U4-2182 and U4-2167
Fixes U4-2234
Fixes U4-2234 including test case from issue