First implementation of correct save nev Target-Tag + Content pair
Merge branch 'ControlPanel'