Commit of remaining files from merge with develop branch