Merge branches 'fixes/20' and 'fixes/21' into fixes/latest