Build 2.1.3 code

Build 2.1.3 code with setup