Sync with Arpit cscart libs