Merge "bugfix: malfunction of scenario equal check"