Updates regarding 2.1.13