Contributions merge

#1187, #1195, #1265