Merge: rev745(Fixes acceptance tests running locally)