Motm 792 dev

Just for the sake of testing here is the PR