- integrated all commits from NFicano main project until up-to-date