Code merge from project user one MASTER to projectcontrol DEV

Code merge from project user one MASTER to projectcontrol DEV