HIPPOTHEME-20: prepare for next development iteration