Product selector sorting fix
Entity admin pages layout adjustments
Merge remote-tracking branch 'origin/dev'