Merge pull request #464 from est77/est

Moved ParamArray::merge to Dictionary base class.
CI build finished and tests passed.
Cherry pick FixedEntityModel work.
Small fixes and improvements