BZ-13040 use different objects for new and newly added statements
Merge branch 'RC20140807' into integration