Black text on the disabled text fields :)
Merge remote-tracking branch 'origin/dev' into dev