Updated
Fixed combo padding
Fixed combo padding
Improved performance on db
Updated
Merge branch 'master' into 1-5-stable