Upstream advanced c1 - horsecaqwe