Merge branch '0.42.1_staging'