small preparation for upstream merge (blocking unit tests of work-in-progress)