Merge "Query for 24Hour format using current user id" into main