Post 18-05 repository forked sync