merge commits of 2.2.1 to public