Merge "Bug: 5009" into stable/beryllium