Merge pull request #4545 from metalbear-co/danielg/MBE-1980-layer-core