Merge branch 'bug/131' into next