Merge remote-tracking branch 'upstream/develop' into cep18