Merge "[COMMON] Fix various helm errors" into london