Changes for branch 1.15