Once again...

sync with b-5.2-ce