Trying smart commit again.

DEMO-8 #close