Community contributions merge

#971 + #1159