Merge branch 'task/JAL-2164_mcviewforoldjalviewprojects' into develop