Merge from dev 0.4.0 and fix for uat lims-core/api