Fixed problems with modern php pre settings
fixed conflict with master