NOJIRA: catchup commit for many small improvements. Yes. Dangerous...:-(