0.21.1

Work for 0.21.1 completed.