Updated from main and also fixed the custom functionality and added test#2

beattyml1 wants to merge 2 commits into

developupcontent/imageproxy:developfrom

feature/new-image-proxyupcontent/imageproxy:feature/new-image-proxyCopy head branch name to clipboard