Sync To dev from Master Local Fix Security - PSR0 & Method

--delete --