Merge: rev811 (Use page object on the common acceptance helpers)