Back-merge from master (for better junits).