Merge "Add fallback for non moving space being full." into lmp-dev