Feature/scc 98 apiupgrade