Merge "DPMS organisation API - Add a missing checkNotNull"