Merge gatekeep code from test branch
Merge github.com:satuktokngulap/ulap