BUGFIX: misspelled method name checkLimits
BUGFIX: incorrect include path
BUGFIX: ChargeLimit column introduces name ambiguity
BUGFIX: incorrect class name
Merge remote-tracking branch 'origin/develop' into develop