[SR-Dev] git:master: Replace explicit flag values with bit shifts for better readability