Fixed issue's with active_user context
Merge remote-tracking branch 'origin/master'