[1080] merge 1080 code with master