Testing first push after pull and some leftover review changes