PICS_2312 completed log4j change spent 1 minute
PICS_2312 commiting
Merge branch 'feature/PICS_2312' into develop