Merge commit '900fe6fe8c6c234386d332f36e713af47a8979bf' into named-rebuild-fix
Merge commit 'b1267ebf56ff3afb4cdff54f3047adfe690c80fc' into named-rebuild-fix
ensure cleanup before restarting named container
Merge branch 'origin/named-rebuild-fix'