- Added fixes from Ela, backports from external sources.

Signed-off-by: Daniel S. Reichenbach <daniel@kogitoapp.com>