Merge "Do not close client after loader loading finished"