Merge branch 'blocking-pop' into dev