merged in cg-topics
cleanup