Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev