Merge "Bluesky flags to follow bit shift represntation"