Re: [cinder] train backport potential bugfixes