MID-637 finishing touches