Issue: #150 Issue: #157 Issue: #170 Issue: #172 Issue: #173 Issue: #174 Issue: #178 User-Visible: yes