merge payment branch to master

@evoevodin Please check it