New features: #847, #929, #930, #932, #935