[-] FO : Fix bug #PSCFV-7743 and #PSCFV-8286, bigpic source change