Fixing mps project
Merge commit '0999eb69ccfd0ddc77ff18ac59a551e39a221772' into interfaces