* [Merge]: Commit merge from https://github.com/zulaxia/belvedere/commit/a3fde5dda709e394d7a6fff2ff8e1ee08c43dae3