Bumped support version to 21