Contributions merge

passed BVT chef-client-test 742

#1076, #1129, #1304, #1250