merging advanced branch into stable