Merge "Fix multiple image space handing for SS collector"