Merge "unskipping bug related to test_stamp_pattern.py"