Merge with develop branch finished