[skip ci] Updated schema revision to 21