Commit no: 1260