Merge "[508388] Add rcptt tests "