Pull request for: several late changes and fixes for Sprint 36