Compilation of changes described bellow.

8 issues resolved in total no other changes made.