Merge "Update junits"