Several commits made after another feature review