Code

Units generalisation (Bug #560751)