[cinder] train backport potential bugfixes