Merge remote-tracking branch 'alfh/bugfix_missing_swapvisibility' into next