added nightly changes from home: https://github.com/t-weber/misc/commit/bd0f2631add366f7e32c3dcc8dc29b6f517928eb