Merge "[COMMON] Allow to include filePaths as a reference to variable"