Brings in following MRs: !585 (merged), !589 (merged), !598 (merged), !599 (merged), !605 (merged), !620 (merged)