Reverted to production state, moved changes to images_v2 branch