Merge "updated comparison rule for dynamic err messages"