Simplified system order.
Added field enter listeners.
Merge remote-tracking branch 'origin/master'