Closes #1243 #1238 #1237

#1236 and #1242 should also be ready pending Enketo Express updates @MartijnR is working on.