2015 code base upload 2nd patch