update with develop (to fix conflict), finish implementation of --modules-footer and add unit test for it