Merge branch '123.08stable'