Changes for 1321114, 19375d1 and 7dfc965
release 0.47