Merge branch '14.01.23'