On second thoughts, I think it's best we fix the various small issues SeongJae discovered, Andrew - could you apply the following fix-patch when things seem ok to move into mm-unstable please? I will pull into any respin going forward also, if they are required. ----8<----
