Now the code style is acceptable for the merge now, according to Bastien. Thanks again Bastien for having this done! :)