Merge "Add tests for Ibb9eb9f65323795d139 and I6571d464a46453934f0"