merge from mangoszero

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