Merge branch 'bp/exit'