Merge commit 'bct/clean' into experimental