Merge "Merge test 539 into test 538-checker-embed-constants."