fix handling of choice evt returned by a guard evt

Closes PR 14195

Merge to v6.0
repair to package manager GUI

Thanks to Odegov Evgeny for the patch

Closes PR 14196