App update from 2.19/2.20 to 2.21

Follow