Merge "[RICPLT-2526] KeepAlive configuration changes"