Coursio/App#654 preliminary operability achieved
Merge remote-tracking branch 'origin/master'