Looks good, marked as RTBC and created MR for easy merging.