Merge "Fully cover the decorator"