Merge dari idathena/trunk: Partial edit up to line #530 (nanakiwurtz <nanakiwurtz240@gmail.com>)