Merge "HA sync for samples simpleforwarding"