Added helper functions from version e978c4c9b177e8d1f36deeec20edb18377dc2ff7 d934632 verified DeclanBracken commited on Jul 24