Initial checking after resetting plastic.
Merge conflict fix