Merge remote-tracking branch 'UPS-0.12.0'