Merge branch 'nr.dev' into 'ibm-trunk'

Nr.dev

Further fixes for customer-reported problems

See merge request !68