CRA-505: Previous checkin was slightly too fast, now tested on more platforms.