Commit to create PR
Merge pull request #3 from mulodo-japan/fix_17269

[WIP] #17269 Bring messages system to AWS server