merge in lastest from shared (work)