Fixed syntax warnings
Merge remote-tracking branch 'origin/add_support_for_masks' into next