Merge with gradle branch