Project Manager custom modules
Merge branch 'development' into IPS