please review and merge

refs RM ticket 3583