Fix resolution limit mask
Merge branch 'developer' into giraffe
Squash compilation warning messages
Fix merge conflicts, squash warnings