first commit post Foundation5 merge