v1.15.45.c.pre

Manual feature merge.