Merge "[SDNC] Move sessionAffinity"