Manual Merge of NB_integration changes

of Commit

02ecb546c4314ee9455afd2c4ea485e4bfa250a1
Important Fix for Displacement

from Nick NB_Integration.

Reason: Unable to merge automatically. Miguel was working in there as
well I think.