Merge "prepare for jenkins test"