Issue refs #1541: merged with main, remove personal tags, fix code and tests