Merge branch 'develop' after fixing lint warnings and modifying gitlab ci config file