updates from latest master

tree: 4a17eed, parent commit: 0e4d767