My new devel branch

Please look at Modification 2 for PR #5996