merged code from branch 816284