Hopefully a successful merge of latest everything.