provided that it is not taught from the viewpoint of any particular religion.

It should be taught as you've exemplified. Remember the key word I used in my second point:

Religious institutions should show more commitment in moral upbringing.

Which means, all Religion.

Since it's the government that has the responsibility of review to bring back moral instruction, it won't be taught with respect to a particular religion except in countries that practice only one religion. At least in my country, back when it was still in our curriculum, it was not focused on religion.

Thanks for stopping by @thekittygirl
Cheers!