#1023, #1024, #1025, #1027: API updated.