Update POMs after merge from master