Merged all Contact Fixes for beta 5