Pull master into B-N-move-bug