Get rid of extra line
Merge in latest from develop