Merge indentation fix and skip decorator with 3.2.